remove spurious conflict marker from ChangeLog

svn path=/trunk/; revision=17527

diff --git a/ChangeLog b/ChangeLog
index 809dc576fcf32ea1c670f4892b4cd12d96695ae6..77670501ad161c75b50eeca21582ddd488b8b6dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,7 +51,6 @@
 
 2007-03-15  Emmanuele Bassi  <ebassi@gnome.org>
 
->>>>>>> .r17523
        * gtk/gtkrecentchooserprivate.h:
        * gtk/gtkrecentchooserutils.c: Move filtering of the recent
        files list into the shared implementation; do the filtering